Fix Bug: Sale clerk or not
Brightcells
3 changed files with 4 additions and 4 deletions
+ 2
- 2
account/models.py
@@ -363,7 +363,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): |
||
| 363 | 363 |
return self.nickname |
| 364 | 364 |
|
| 365 | 365 |
@property |
| 366 |
- def data(self): |
|
| 366 |
+ def data(self, brand_id=None): |
|
| 367 | 367 |
return {
|
| 368 | 368 |
'user_id': self.user_id, |
| 369 | 369 |
'name': self.name, |
@@ -373,7 +373,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): |
||
| 373 | 373 |
'phone': self.phone, |
| 374 | 374 |
# TODO: Diff for Brands |
| 375 | 375 |
'has_membercard': self.has_membercard, |
| 376 |
- 'saleclerk': SaleclerkInfo.objects.filter(unionid=self.unionid, status=True).exists(), |
|
| 376 |
+ 'saleclerk': SaleclerkInfo.objects.filter(brand_id=brand_id, unionid=self.unionid, status=True).exists(), |
|
| 377 | 377 |
} |
| 378 | 378 |
|
| 379 | 379 |
|
+ 1
- 1
miniapp/views.py
@@ -80,7 +80,7 @@ def get_userinfo_api(request): |
||
| 80 | 80 |
|
| 81 | 81 |
set_profile_info(user) |
| 82 | 82 |
|
| 83 |
- return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.data) |
|
| 83 |
+ return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.data(brand_id=brand_id)) |
|
| 84 | 84 |
|
| 85 | 85 |
|
| 86 | 86 |
@logit |
+ 1
- 1
requirements_dj.txt
@@ -4,7 +4,7 @@ django-cors-headers==2.3.0 |
||
| 4 | 4 |
django-curtail-uuid==1.0.4 |
| 5 | 5 |
django-detect==1.0.5 |
| 6 | 6 |
django-file-md5==1.0.2 |
| 7 |
-django-file-upload==1.0.5 |
|
| 7 |
+django-file-upload==1.1.0 |
|
| 8 | 8 |
django-ip==1.0.2 |
| 9 | 9 |
django-json-render==1.0.1 |
| 10 | 10 |
django-json-response==1.1.5 |